Fix padding handling

diff --git a/ChangeLog b/ChangeLog
index 1452f04a458d7c45196c610f548fefcb2f0402b6..67bb5c2e38f7a861e970b0e20e1f6b0d123cd387 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtklabel.c (get_layout_location): Fix handling
+       of padding in RTL.  (#329099, Hooman Mesgary) 
+
 2006-02-02  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1452f04a458d7c45196c610f548fefcb2f0402b6..67bb5c2e38f7a861e970b0e20e1f6b0d123cd387 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-02-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtklabel.c (get_layout_location): Fix handling
+       of padding in RTL.  (#329099, Hooman Mesgary) 
+
 2006-02-02  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display):

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 1ad227dc7a7f54adb9fd7d2c19f6a19d73a83b96..28ea816c05f2a590deec04c86db54e83af0de32c 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2237,9 +2237,7 @@ get_layout_location (GtkLabel  *label,
   if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
     x = MAX (x, widget->allocation.x + misc->xpad);
   else
-    x = MIN (x,
-            widget->allocation.x + widget->allocation.width -
-            req_width - misc->xpad);
+    x = MIN (x, widget->allocation.x + widget->allocation.width - misc->xpad);
 
   y = floor (widget->allocation.y + (gint)misc->ypad 
              + MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign),